Merge "Disable flaky split screen assertion" into main