Merge "Fixing ActivityInit getting called before the full launcher components are initialized" into sc-dev