Merge "Fixing LauncherState not getting applied in some cases" into ub-launcher3-master