Merge "Update input windows off the hot path"