Optimizations to reduce binary size, hopefully doesn't break anything.
calendarProvider: fix problem with event search.
Get rid of dependency in binary blob.
Merge with upstream