Merge "Improve hostside test for App window resize" into nyc-dev