Always raise the window that is intended to be shown
Merge remote-tracking branch 'chiiph/bug/raise_if_osx' into develop