Merge "Fix flicker from multiwindow resize" into oc-mr1-dev
am: facdce3ab2

Change-Id: I217c2db8adcb5b2b9ad2ffcd3226176c7e7c08c4