Hide locale switcher (for 3.2.1)

Change-Id: Ib23c133b41a1c23b63384e4a60025df7732c8ba6
Merge "Hide locale switcher (for 3.2.1)"