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

* commit '58c483fcff4608ead41f8af9b2b1e2d5ae92561c':
  Avoid OOBE when AbsListView layout is out of sync with adapter