Merge "Mitigate antialiasing on button corners" into main