Hygiene: Making our use of local storage more robust

Even if a browser says that it supports local storage, that isn't
a guarantee it will work.

Change-Id: If2e745f7bc7bb6bf24fb9b533f4b46dc5aad348b
Merge "Hygiene: Making our use of local storage more robust"