Merge "Rename the fix_unlocked_device_required_keys flag" into main