Merge "Removing logic around replacing icon during restore" into ub-launcher3-master