Merge "Metrics for user choices in storage wizard." into pi-dev