Merge "Removing user locked change in LauncherAppState" into ub-launcher3-qt-dev