Merge "Update headset, help, and info icons" into pi-dev