Merge pull request #4381 from BigNoid/textbox_height

[Confluence] Textbox fixes for ok | yes/no | progress dialog
Merge pull request #4369 from jmarshallnz/skip_video_thumbs

[video] skip thumb loading earlier so we don't call CDirectory::GetDirectory()