am 7914680e: am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev

* commit '7914680e1ec319f50cb99b6c761aace56fc6e3ed':
  Avoid OOBE when AbsListView layout is out of sync with adapter