Merge "Add header to USB power options preference"