Merge "Fix NPE in CallIntentProcessor"