Merge "Bug: b/307278302 Fix clipping of DesktopTaskView border on focus/ hover" into main