am a7428568: Merge "Fix drag outlines for full-sized icons" into jb-dev

* commit 'a742856872c4e4a2fd3d9a91457dedae6cc0eab1':
  Fix drag outlines for full-sized icons