Merge changes from topic 'highlight_fixed' into oc-dev

* changes:
  Check default focus highlight for ImageView.
  Check state_focus in foreground.