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

* commit '7078a446874bdb2a51b9eae8b41f9d1ec0bce86a':
  Remove circular_display_mask_offset symbol and default