Merge "Fix SurfaceView callback timings" into sc-dev