Merge "Remove frame rate functions from buffer queue" into rvc-dev