Merge "Improve caption layout" into tm-qpr-dev