am 576a0d14: Merge "Fix circular mask" into klp-modular-dev

* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
  Fix circular mask