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