Merge "Fix isSystemUi to avoid System services" into main