Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev am: 9cd92959e6
am: 9169df47c5

Change-Id: I52ee3b55f0e6e7735738ec1ac07dd0e44d04124d