Merge "UI changes for icons in sim settings" into lmp-mr1-dev