Merge "Apply stable config compat override after other compats" into 24D1-dev