Merge "WindowInfo: Merge InputConfig and Feature flags" into tm-dev