merge in klp-release history after reset to klp-dev
tree: 19cb5814290e37f142efa85f7c9bc1850d2a9246
  1. InCallUI/