Merge "Fix regression breaking SurfaceView in docked." into nyc-dev