Merge "Refactor BackgroundUserSoundNotifier" into main