Merge "Show correct visual effects for modes with interruption filter NONE or ALARMS" into main