Merge "Don't double-invoke scroll ended listener in animate*"