UI-3327 : move the bug fix of calendar to platforum ui