Merge "Reduce flakiness of testDisplayRotationChange" into main