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