Merge "Use SceneTransitionLayout for weather clock" into main