Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev