Merge "Avoid Calendar's unexpect change in snapToCycleDay()"