Merge "Fix NPE when hitting back in InCallActivity" into mnc-dev
tree: 8ed09310b352575b1402f9f852a730f75656a2ac
  1. InCallUI/