Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev...
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e am: 9c7f6a40
am: 7078a446
* commit '7078a446':
Remove circular_display_mask_offset symbol and default