Merge "If modes_api is on, log active rule types even if zen mode is off" into main