automerge: 4212bf1 * commit '4212bf1fad7ab15b10926b30038aae380697aaa3': Improve the circularMask for round displays