Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier