Merge "Remove QS drag handle" into sc-dev