Merge "Add missing wrapper for VHAL Wheel enum" into pi-dev