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

Change-Id: Ifd944500fb75bdefa30e0f083e26b0de2cc1cb3a