Merge "Remove dead code in checkForRingerModeChange" into main