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
Change-Id: Icade39e607b7e122ae0fc6bb432ff143f4fe910b