Merge "Add sim color selection in settings" into lmp-mr1-dev