Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
am: 7f54aa1e81

* commit '7f54aa1e814527371d54864bcbf9387553822ea7':
  Remove circular_display_mask_offset symbol and default