Merge "Use minimumInteractiveComponentSize() instead of custom modifier" into tm-qpr-dev