Merge "Require authentication for changing USB preferences." into main