Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev