Merge "Camera: fix race issue in Camera2 clients"