Merge "Wait for IME to hide in test only if software keyboard." into main