Merge "Use minimumInteractiveComponentSize() instead of custom modifier am: fac75fe58b am: 9511ff7efd"