Merge "Show incall UI correctly."