Merge "Revert "Salt the package hash code using the device serial Bug: 62676166"" into ub-launcher3-dorval-polish