Pulled in msim commit from upstream: Add global settings for naming sim cards