Merge "Revert "Disable XOM in camera.v4l2.""