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

Change-Id: I701b817d0109c650069d445548280bec4193729d