Fixed an issue where the player would flicker on when expanding

Our expansion hack doesn't work if at the end of the expansion,
the shade is still appearing. We only will do it now, if the
target location isn't an appearing position.

Fixes: 153321587
Test: add media notification but no others, expand, observe smooth transition
Change-Id: Ib278882500087d133826064007fa8ab3071445a0