Merge "Camera3: add dynamic buffer count water mark support"