Merge "Improve jank when reloading the home page for configuration changes" into sc-dev