Auto size the content of the simple popup content, so that the text is not overdrawn by the buttons
Merge branch 'auto_size_popup' into development