Merge "Allow toggling USB data access in lockdown mode" into main