Merge "Check mNativeClass != null in public functions"