Merge "Merge "Resetting the scroll position of the media players when allowed"...
Merge "Merge "Resetting the scroll position of the media players when allowed" into rvc-dev am: 2cdb725b am: a9db496c" into rvc-d1-dev-plus-aosp am: e32b0343 am: 606ee822
Change-Id: Ibf639c576cf06fcabfb7a08118eb55fcf776b507