Merge "Remove flag disabled strings from string pool" into main