Merge "Fix possible NPE in AdapterView's OnItemClickListener clients. Bug #2533718"