Merge "Fixing some issues/regressions related to scaled icons."