Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev