Merge "Prevent client got NPE crash if setIntent was set to null."