Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6
am: fa33b23ee8

* commit 'fa33b23ee81d91a5c344be60039f27590ed0b194':
  Change overdraw test to use windowbackground

Change-Id: Ib45ac99f10c3f511b54d1c8c5e06db141a125965