Merge "Fix regression setting input windows." into honeycomb