Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev