Merge "Various changes." into lmp-dev
tree: a92e777cbb12eedca23e3d37d68672fd183fde0c
  1. InCallUI/