Bug ZK-2267: Popup is only sometimes "visible" when it is opened
Merge remote-tracking branch 'upstream/6.5'