Merge "Fix split-screen flash issue" am: 6738617652 am: f1fed4de21 am: 4e7407a80e
am: 3f23c9f36e

Change-Id: I195eee0b57f216ab1778d74fc7ec72b6d36e244b