Merge "Removing Key-Value pair backup logic as Launcher now uses full-data backup" into ub-launcher3-calgary