Merge "Make sure PipDragThenTest is gravity agnostic" into udc-dev