Merge "Fix bug 3005359 - onListItemClick and ActionMode conflict"