Merge "allow updating enterprise strings in sysUI"