Merge "Address LAUNCHER_APP_LAUNCH_FROM_ICON jank." into sc-dev