Merge "Add divider between QS and media" into rvc-dev