Merge "Track LauncherState for task bar stashing better" into sc-v2-dev