Merge "Allow forceUpdateUserSetupComplete on user builds" into sc-dev