Merge "Fix bug 5312352 - ListView modal multi-select mode bugs"