Merge "NotificationMediaManager is bad signal for resumption" into rvc-dev