Merge "Hide handle when expanded view drag starts" into main