Merge "Remove legacy QS background" into sc-dev