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