Merge "Clarify unit test testOnStartingWindowDrawn" into main