Merge "Use a new fixed-read-only flag to control the e2e feature" into main