Merge "Fix SurfaceViewPositionListener race bugs" into nyc-mr1-dev