Merge "Don't reset alpha after dragging to dismiss" into main