Merge "[DO NOT MERGE] Resolver/Chooser - Window inset fixes" into qt-qpr1-dev