Merge "Catch potential NPE" into klp-dev
tree: 01cc8cda21690c7ba3beae1f9bbbac0bcc817386
  1. InCallUI/