Merge "Change QS drag handle color" into sc-dev