Merge "Update edge resize handle to 10dp and add a 2dp inset into the task bounds for edge resizing." into main