Merge "Implementing keyboard indicator dialog" into tm-qpr-dev