Merge "Fix SurfaceView handler." into oc-dev am: 5366cfbef3
am: 0fc7ca44e8

Change-Id: I39cbc26e1b9c05dd0da7b04c59480812125f2aca