Fix up confusion with relayering after movement drags in