Merge "Fixing crash in restore" into ub-launcher3-burnaby