Merge "Add null check on device posture change" into main