Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev