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

Change-Id: Ia982ffd2819b59515afecdf6f18c72f36ea86a23