Merge "Merge "Fix small buttons in collapsed layout" into tm-qpr-dev am: 5ff4c03fb2 am: 6982e2fa42"