Merge "storaged: fix divide-by-zero when updating history" into pi-dev