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

* commit '8bb7e488e2564b75d8d920850891675090debcca':
  Fix regression setting input windows.