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

Change-Id: I5f38049b60965d8d2a5447b7bd44b001778584d0