Merge "Revert "Camera2: Fix a potential race condition in the readout thread""