Merge "Fix concurrentModificationException of DevicePostureController listeners" into main