Merge "Fix underdraw during resizing" into oc-dev
am: 906fe92759

Change-Id: I25fe2b06324f238d2d5d6092837919d1f5659bf3