Merge "Don't removePluginListener() unless user is unlocked" into ub-launcher3-master