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

Change-Id: Ib71474073088c9098652f1f1a792aab615676cd9