am 99b4572c: Merge "Fix NPE when hitting back in InCallActivity" into mnc-dev

* commit '99b4572c41bd1b6c236ebdf195261efb5746a896':
  Fix NPE when hitting back in InCallActivity
tree: fca15403f834b0a966b7ce01ea5412d6cccff757
  1. InCallUI/