Merge "Use icon splash screen when starting activity from widget interaction" into sc-dev