Merge pull request #2841 from dumganhar/master

Some fixes for Android, BB and iOS when testing. Please refer to commit for details.
Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value.