Merge "Camera3: Add missing mTriggerMutex lock"