Merge "Catch CCE when migrating to ClipData." into jb-dev