Merge "Extra to always show advanced devices." into klp-dev