Merge "Support for ringer mode to affect alarm stream" into main