Merge "Reinflate QS view on Locale configuration change" into nyc-dev