Always pass a legal position to expandFromStack so that we don't return to an illegal position.

This was originally possible if the stack was expanded by tapping it while it animated across the screen.

Fixes: 123023410
Test: manual
Change-Id: Idc403dfe6affb0aac4fc5027fa9e97f8a733b31a