am f30faf24: (-s ours) am db0a6017: DO NOT MERGE Ensure foreground colour is set during drag

* commit 'f30faf2462874125f096d90e8a02cfd1470bc52f':
  DO NOT MERGE Ensure foreground colour is set during drag