Merge "Stop layout reset by setting empty locale list." into nyc-dev