Merge "Disable expensive rendering during static screen" into sc-dev