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