Pass widget along with dialog so the instance is easily accessible.
Merge branch 't/10851' into major