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

Change-Id: I29980e5255957c1830a72707bb20c2de128d76ac