Merge "Controls UI - Various header fixes" into rvc-dev