Merge \\\"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\\\" into nyc-dev am: d11b5e6661 am: 1ef9b355b0
am: 1450121bb3  -s ours

Change-Id: Ie48228b447fb029a646aa9e55b41ff27957fad57