[Merge] Small improvement for ag/17016891 (unstash taskbar input area size)

Because of a merge conflict in ag/17141712 we have to first accept
this and then the other.

Bug: 204166104
Test: Unstash and stash taskbar, done in both orientations.
Change-Id: I14c3593552939f3be78f3e5c1193020873555d37