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

* commit '9c7f6a409b516328378aa9b882de16c4700c76c4':
  Remove circular_display_mask_offset symbol and default