Merge "Remove the flag fix_unlocked_device_required_keys_v2" into main