Merge pull request #3429 from ussuri/turn-apk-generation-off-by-default

Turn APK generation off by default