am b1144cff: am 6bbea8cf: Fix LocalePicker background

* commit 'b1144cff1b1139d57a8489eda81540cc72530bff':