Merge "Optimize offscreen layer management" into sc-dev