Merge "Don't removePluginListener() unless user is unlocked"