Merge "Fix split-screen flash issue" am: 6738617652
am: f1fed4de21

Change-Id: I67953f2bda3222ec53f0f6d2423df8287439ffe1