Merge "Remove released legacy sysui flag" into main