Merge "Update storage wizard to latest UX mocks." into pi-dev