Merge "Change overdraw test to use windowbackground" into nyc-dev