Merge "Prevent removing the feedback view and callbacks when the user completes a gesture." into tm-dev