Merge "Fix arc positioning" into nyc-dev am: 5005033fa3
am: 43fedadea8

* commit '43fedadea8885ef435b0fdba9edaf47e69473373':
  Fix arc positioning