Merge "Support direct DOZING->PRIMARY_BOUNCER" into main