Merge "Disable drag handle." into rvc-dev