Merge "Remove legacy split-screen windowing mode usages from CTS" into sc-dev