[DO NOT MERGE] Resolver/Chooser - Window inset fixes am: 95ede7fb53

Change-Id: I77a948f5599ee8c3453b758136ea13c62ad95e69