Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev