Merge "Don't cache mFirstPosition before a layoutChildren in ListView.onFocusChanged"