Merge "Don't switch DND configs in ZenModeHelper upon reception of USER_UNLOCKED" into main