Merge "Re-add .gitignore for GN"