Merge "Controls API - Flag controls support" into rvc-dev