Merge "Do not relayout on default focus highlight." into oc-dev am: badb83b332
am: 806ee59c00

Change-Id: I83152e4405573b21e92fc92190bee9bae82d101b