Merge "Fixing bug that prevented 'Emergency call' from being displayed" into nyc-dev