Merge "Fix SurfaceViewPositionListener race bugs"
am: 2dc11c0500

Change-Id: I504b1c0923c7c9b3fd393c37b3ba85af43882a8b