Merge "Settings psuedolocalization fixes." into lmp-dev