Merge "Launcher restore state fixes:" into ub-launcher3-calgary-polish