Merge "Flexiglass: hydrate dozeAmount from transitionValue(AOD)" into main