Merge "Wear doze -> on transition" into main