Merge "Create flag for public app compat properties" into main