Merge "Clean up use_frozen_state_to_drop_listener_alarms flag" into main