Merge "Add frame rate flexibility token" into rvc-dev