Merge "Revert "Add Emergency Info preference to user settings""