Merge "Simplify SoftInputWindow"