Merge "Rename profileSystemServer to shouldProfileSystemServer"