Merge "Disallow modifying USB in Settings" into sc-dev