Merge "String changes for suppressing ambient display" into pi-dev