Merge "Remove option to configure emergency app" into nyc-dev