Merge "Skip recreating the nav bar when locale changes" into sc-dev