Merge "Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev am: 7666d6f967 am: adcc61d65f"