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