Merge "Make RotationChangeProvider Threadsafe" into main