Merge "Bug 521483 - Support multi-selection in the generated selection dialog "