Merge "Don't show badge for media style notifications" into rvc-dev