Merge "Widget MS startup fix and Onboarding changes"