Merge "Fix hidden label in in-call screen." into jb-mr2-dev