Merge "ViewOverlay CTS tests" into nyc-dev