Merge "mm-video: update actual buffer count based on client req"