Merge "Make sure to close popup before orientation changes.." into jb-dev