Merge "QCamera2: Increase number of buffers for a stream" into lmp-mr1-dev