Merge "Restrict dock sides after rotation" into nyc-dev