Merge "Only update zen rule name on locale change"