Merge "Catching OOM exceptions in auto-investigator" into ub-launcher3-master