Merge "Update content descriptions when text/icons are updated" into qt-dev