Merge "Fixed issue with ordering of non-app token windows"