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