[Calendar] Fix the issue of removeBatch.

* JIRA: PTSDK-1291
Merge branch 'next' of github.com:01org/web-simulator into localnext