Merge "Remove unused R8 keep rule in SystemUI" into main