BIRD-106: Applying Light Theme to Map Settings.
code reviewer: rmiller
Merge commit '1ddb46d166675cfd0bfd8bae078863402789c80e' into SPRINT-SIX