Merge "Calculare direct share expansion height only if epansion is enabled" into udc-dev