Merge "SetupWizard: Ensure language picker is enabled onResume" into mm6.0