Merge "Use non-cached value when calculation button forced visible state" into udc-dev