Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907 am: 2f927d56 Change-Id: Idd571a3e786afba287b83277d2e95f7143d4e37d