Merge "Prevent ConcurrentModificationException for IndividualSensorPrivacyControllerImpl" into main