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