Merge "Disable DragDownHelper in QS" into lmp-dev