Merge "Set correct bounds when docked stack is removed" into nyc-dev