Merge "Keep metadata and buttons in the same position" into tm-qpr-dev