Merge "Fix sim pin settings" into nyc-dev