Merge "Kill the app once a compat change override is changed."