Revert "Merge pull request #21444 from alivedise/bugzilla/1027401_v2.1/reset-orientation-on-popupclose"

This reverts commit 4e3f949226e82938aa8ce0fa9c7d29f36243afde.