Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c' * commit '7f2ae493c58e221b2961ccbd92de24565665633c': Fix a JNI layer crash due to null camera object passed to get_native_camera()