Merge "Fix SurfaceViewPositionListener race bugs" am: 2dc11c0500
am: ee3adf6d91

Change-Id: Ie8740252ca7dd3dab200303e88d1bd82370bbf4e