Merge changes I9469b597,Ia3f0ffb3 into main

* changes:
  Use RootTDAOrganizer to obtain TDA windowing mode in desktop mode
  Use RootTDAOrganizer to determine caption visibility