Merge "Remove unused support for "pattern ever chosen"" into main