Merge "Fix non-resizable split flicker tests" into sc-dev