Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e' * commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e': Check to make sure the Java camera object is still valid on the
Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e' * commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e': Check to make sure the Java camera object is still valid on the