Merge "Resolver: Modernize layout" into qt-qpr1-dev