Merge "Reapply changes of inline reply CL" into tm-qpr-dev