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

Change-Id: Iae0cfdbe8dfe79142c55d282069d9740f83f1b3f