Merge "Restore fix for native activity without a java-code" into nyc-dev