Merge "End current key button animations when the button is hidden"