* commit 'c470b2dd49ae2c4894de22f7bdd9f91af1a085f8': Part of fixing issue #6006757: Keyboard dismissal lags