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

* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
  Extra to always show advanced devices.