Merge "Fix dumpsys flag strings" into main