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

Change-Id: I91829dceceaf3d2a273f43d9f1d7732cd30b8ff4