Merge "Remove legacy-flow no-op variables: max, realMax and realProgress"