Merge "Ensure we leave space between layers in docked stack." into nyc-dev