Merge "Fix emergency call layout." into nyc-dev am: 04abe42
am: c7a3888

* commit 'c7a3888a1397b7ab1dfbbcf86aba31765ea6017c':
  Fix emergency call layout.