Merge "Fix SystemUI lint checks" into main