Merge "SetupWizard: Handle ActivityNotFoundException in LoadingFragment" into mm6.0