Merge "Revert "Add media icon to status bar"" into rvc-dev