Merge "Fix IME is beyond the screen if the app doesn't fill its parent bounds"