Merge "Storage wizard UI tweaks." into pi-dev