Merge "Revert^2 "Use optimized resource shrinking for SystemUI"" into main