Merge "Preventing workspace scroll over QSB area" into sc-v2-dev