Merge "Do not relayout on default focus highlight." into oc-dev