UI-3272  Incorrect UI of select location dropdown
Merge commit 'f6e60924bf7b46e8977595dceb1682577063d95c' into HEAD