Merge "Add clipboard source to edit image intent" into tm-dev