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