Merge "Resolver/Chooser - Window inset fixes"