Merge "Fix small buttons in collapsed layout" into tm-qpr-dev