Merge "Suppress Splash Screen on widget reconfiguration activity start" into sc-dev