Merge "New behavior for docked stack when going home" into nyc-dev