Merge "Improve header dragging" into mnc-ub-dev