Merge "Reduce flicker memory consumption (Pt 4)" into sc-dev