Merge "Limit LOCALE_CHANGED broadcast when init'ing." into nyc-mr1-dev