Merge "Fix split-screen flash issue"