Also put show in the finish transaction when setting up animation

It's possible for a series of merges to happen on the same task.
If only the hide's are represented in the finishT and the startTs
were merged, then its possible to leave surfaces hidden when
they shouldn't be.

Bug: 278590171
Test: make rapid successive quickswitches and swipe-ups.
Change-Id: Ifacf5811cb64451013df87f7305f761c5eb78a47