Merge "Merge "Use optimized resource shrinking for SystemUI" into main am: 489002ec4d am: 794d3af618" into main