Merge "Include settings app compat config in the build."