Merge "Remove unnecessary configChangeFlags" into main