Merge "Revert^2 "DevicePostureControlller to use the device posture of the device display"" into main