Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view"