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

Change-Id: I13ae3e1e6c8899d0dca7354f13e2ed193e3f9061