This ensure that fix intended by commit 2d954c07,
applies throughout the transition from session to appgrid and vice-versa,
instead of applying only from window-picker to appgrid.
We also want to clip workspace throughout the transition from session to appgrid and vice-versa.