Merge "Fix SurfaceViewPositionListener race bugs"