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

Change-Id: I673d348e511fca5c1798d2c2a26800f6eb5f2a19