[TIMOB-17884](3_4_1)

This PR fixes the following tickets:
https://jira.appcelerator.org/browse/TIMOB-17877
https://jira.appcelerator.org/browse/TIMOB-17884
https://jira.appcelerator.org/browse/TIMOB-17085

Testing steps:
1. If your project is already installed, please clear data and cache and uninstall it first
2. Build a custom SDK using this branch, then use the zipped map updated in this PR to test
3. You can test it with any basic maps, as indicated in the tickets themselves.