Merge "Defend against null intents in CameraIntents." into sc-dev