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

Change-Id: I9f918348774446b5251026bcdc445546f660dd76