Merge "InCall code cleanup"
tree: 7ac1d12424e07dc6e71dea356972a3865d26c46a
  1. InCallUI/