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

Change-Id: Idc3a8f95bea47bad543d90e9ad18c606255e55ae