Merge "[wpp2] Adds support for a "supporting text" section in dialogs." into udc-dev