Merge "Storage wizard string changes per UX request." into pi-dev