Merge "Making the media carousel dismissable" into rvc-dev