Merge "Fix system icon widths" into lmp-mr1-dev