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

Change-Id: I00f19b60e9a670992eaf985b92213cf8475f0382