Merge "Do not reinflate navbar on theme changes" into sc-dev