Merge "Remove Logger classes from flicker" into main