am 85c114df: Merge "Various changes." into lmp-dev

* commit '85c114df8721b51b3b76cba9e7f9af825d05dc26':
  Various changes.
tree: a3237e41802436f35cc37987a364f17c4fa485d7
  1. InCallUI/