Merge "Use MATCH_ANY_USER when checking for system apps" into main