Merge "Add configuration possibilities for Emergency SOS"