Merge "Take account of IME insets" into tm-qpr-dev