am 7bf9d3e6: Merge "Disable cross-fade in InCallUI" into lmp-mr1-dev

* commit '7bf9d3e640da7d3a45e5795a7e5ecbd96edf9743':
  Disable cross-fade in InCallUI
tree: 6ad9588d17b329c2265c7987f25858e200e96cdd
  1. InCallUI/