Issue #21852: Additional commit to support PG9.3, fixes for the xtdesktop users online dock