am 747aee5a: am 8bb7e488: Merge "Fix regression setting input windows." into honeycomb

* commit '747aee5ab96503796e55fcd444c440197cecd39a':
  Fix regression setting input windows.