[automerger skipped] [DO NOT MERGE] Resolver/Chooser - Window inset fixes am: 95ede7fb53
am: d6c8280a7d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia0b8ba008aa9c011826fd8965b783a0e27ce3063