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

Change-Id: If552c1dd71a2a29be166f85ac7f75c20922aa60e