Merge "DeviceStateRotationLockSettingsManager: only persist setting when value changed" into tm-dev