Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
am: 102520f88e

Change-Id: Ib6fd927e1d8af019ea2a644b95cd6dfc7ae8851d