Merge "Reset Task surface to no-crop after pip expand when fullscreen"