Merge "Hide carrier string when emergency call button pressed." into jb-mr2-dev