Merge "Fixing small bug where you could not cancel springloaded the first time you drag out of layout."