Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev