Merge "Fix underdraw during resizing" into oc-dev