Merge "Fix locale reorder jank" into nyc-dev