this improves restoring window location should it be within
the secondary screen

Change-Id: Iaac6bcead6bfcb7ae9eda579e5a4ad6b2482cc39