Merge "Fix emergency call layout." into nyc-dev