Merge "End switch thumb animator if it's been started"