Merge "Ensure lock for unregisterActivityConfigurationListener" into main