Merge "Fix fling to dismiss behavior" into main