Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev