Made background updater more robust to state changes
am: 9bfba9c157

Change-Id: I32e762641b7efd9ce10f0b7d6b21b986c58c617e