Merge "Fix popup window position calculation in multiwindow mode"