Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev