Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev