am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev

* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays