Merge "Add Emergency Info preference to user settings"