Merge "WM: Adjust TaskSnapshot for cutout layout"