Merge "Fix leak in RotationHelper registration to DeviceStateManager" into main