Merge "Fix ConcurrentModificationException in RotationChangeProvider" into main