Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1