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

Change-Id: I829cdf978fa523751b617c19f173274812c260bf