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

Change-Id: Ib85ff9f162f4511726d270e9d1ab94734c04e054