Merge "Disable drag behavior until toggle is on" into rvc-dev