Merge "Removed commented out code related to ForegroundAudioControl" into main