Merge "Tweak transition logs to make them a bit easier to follow" into main