Merge "Move addPluginListener to onUserUnlocked" into ub-launcher3-master