Merge "Fix minimized dock" into nyc-dev