Merge "Rename AppSettings to AppInfoSettings for Spa"