Merge "Revert "Dialog for emergency info"" into nyc-dev