Merge "Hide no active camera NPE by defaulting to camera device -1" into ub-camera-haleakala