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: 79118c45 am: fbea2f44" into rvc-qpr-dev-plus-aosp am: 7aab8fac
Change-Id: Iff2512d43a7bef6a7ea45bb09565ef9a86683c89