Merge "Add TunnelModeStateListener in java+jni" into sc-dev