Fixed Shade freezing when tapped while collapsing

Shade collapse animation would freeze if the shade was tapped quickly
enough to not exceed touchSlop, as the code that starts the animation
again would not be run in this case. Added an extra condition that
allows these taps when the shade is in a partially expanded/collapsed
state.

Test: manual
Bug: 233309355
Change-Id: I321fef348128880fa9057496f97fa9b2a96f4804