Merge "Resetting the scroll position of the media players when allowed" into rvc-dev