Merge "Fix invalid stack position when docked on right" into nyc-dev