Merge "Don't resize task when dismissing docked stack" into nyc-dev