Merge \\"Move SurfaceView offscreen if the app stops drawing it\\" into nyc-mr1-dev am: e66dedf35b
am: 61513724f0

Change-Id: Ic02576c35007d6aaaa8807c529ab54717d2740a7