Merge "Create setting key for emergency gesture call number override"