[GF] Fixing Calender layout timing issue