Setting item to null, still keeps an entry in localStorage
This also breaks the old implementation in the case of rollback
which happened today.

This patch adds some safe guards to make sure any existing broken
states are fixed, any the entry is removed going forward.

Bug: T272638
Change-Id: Ib7c0a45fcf8645a900288a26d172781612fa1606