Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev