am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev

* commit '80f103ae12c4eb90fc2e06a6921dde2f092a181b':
  Extra to always show advanced devices.