Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev