Merge "Launcher state management cleanup" into ub-launcher3-master