Merge "Make sure task exists in WM before trying to set the resizing state" into nyc-dev