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