Make patch for #11021 bulletproof - hidden selection container may not be present in DOM any more.
Comments.
Merge branch 't/11393'