am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev

* commit '9c5cc571e5abf97a816fea2b04cd1e711e83564c':
  Support for "not the home app you're looking for" metadata