Merge change Ic854f281

* changes:
  Force a re-layout of children if ListView is out of sync with the adapter in onFocusChanged. Addresses bug 2157773