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

Change-Id: I3d070161a4bdacd0cdcf2e61f026f9fffe15890e