Merge "Support for "not the home app you're looking for" metadata" into klp-dev