Merge "Merge "Resetting the scroll position of the media players when allowed" into rvc-dev am: 2cdb725ba6 am: a9db496c37" into rvc-d1-dev-plus-aosp