Merge "Sonar fixes for MusicApplication"