Merge "WM: correctly draw the rounded corner / cutout overlay during rotation"