Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev