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