Merge changes from topic "plugin"

* changes:
  Remove view from existing clock plugin when new plugin connects.
  Update script to consider code moved to plugin_core.