Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev
am: d11b5e6661

Change-Id: Ide1396069ee945f744cbc0ece45990b0e5d49dab