Merge "[0/n] Create Flag for App Compat Refactoring" into main