Merge "Set task surface crop to null when in fullscreen mode" into main