Merge commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341' * commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341': Fix bug 2918587 Infinite loop and memory leak in AdapterView
Merge commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341' * commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341': Fix bug 2918587 Infinite loop and memory leak in AdapterView