Merge "Restore initial location after drag to dismiss" into main