Merge "Remove hotseat edu flag" into rvc-dev