CAL-1028 OOME happens while using calendar unified search
Merge commit 'e3f92cdc3960f600397b6b550345b9ae28061430' into integration/4.2.x-translation