Merge "Fix regression when setting initial offset when docked." into nyc-dev