UI-2750 Incorrect UI of Navigation Selector