Merge "Don't list apps that are disabled by the system" into klp-dev