Merge "Fixed bug with pop-up window placement at the bottom in split-screen" into nyc-dev