Merge "Merge "Fixed bug with pop-up window placement at the bottom in...
Merge "Merge "Fixed bug with pop-up window placement at the bottom in split-screen" into nyc-dev am: 21bbc5a7 am: 73da942b" into nyc-mr1-dev-plus-aosp
am: 7359cca5
* commit '7359cca5':
Change-Id: I4feaede10e0e78343180db39810cd3228fe67773