Merge "Enable matching of non-system app services"