Merge "Migrate extras to ClipData for image/video capture intents." into lmp-dev