Merge "Ensure screenshot dismissal velocity is never 0" into main