[automerger skipped] Merge "[DO NOT MERGE] Resolver/Chooser - Window inset fixes" into qt-qpr1-dev am: 2c5bd63efd
am: 3d3d051455 -s ours
am skip reason: subject contains skip directive

Change-Id: Id022d3658c8a1afe6c1c9d26eb77513d22fcff60