Merge "Fix two panel tapl test dragging issue"