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

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