Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev