Merge "hook database restore with restore session" into ub-launcher3-master