Merge "Add FocusOnSelection property to GenList"