Merge "[Multi-user] Properly check for system apps in multi-user context"