Transition to a common Lollipop element upon reactivation with a change in keyboard size

Question

I work with Lollipop transitions between two actions. I have a common element that I am animating with the transition to actions A and B. In activity B, the keyboard pops up and resizes the window. The animation looks great when switching to activity B. The problem is the return to activity. A transition with a common element looks bad, because the size of the windows still depends on what its keyboard has changed (even if the keyboard automatically minimizes when you return to A and the window is ultimately the right size).

I tried manually hiding soft input before leaving active region B and calling finishAfterTransition. Unfortunately no luck! I also tried to delay the transition of common elements, but that didn't work either. One solution would be to have a slight delay (10 ms) when the user clicks back to end activity B to allow window time to resize itself before leaving, but that seems hacked to me.

Any ideas are greatly appreciated!