Merge "Fix issue with keyboard disappearing too late." into tm-qpr-dev