Merge "Reduce user icon RAM usage" into lmp-mr1-dev