Merge "Fix NPE in InCallController due to potential null call." into oc-dev