Merge "Remove flags ignored by R8" into main