Merge "Update .gitignore to better deal with .idea files." into nyc-support-25.2-dev