Merge "Don't pull magnetized objects into the target unless they're dragged." into rvc-dev am: b2a2121b94

Change-Id: Ie7fd25820492e578f730a7583a70ef60360bfbe6