Merge pull request #3956 from dumganhar/iss2905-folder-structure

issue #2905: [iOS Mac] Updating project configurations.
Merge pull request #3957 from dumganhar/iss2905-folder-structure

Update auto-generated submodule manually.
issue #2905: [iOS Mac] Updating template.