Merge "Refactor SelectionModeListener." into nyc-andromeda-dev