Merge changes If8da2ae5,I38445a13 into sc-dev

* changes:
  Log duration privacy toggle was in previous state
  Persist the last time a sensor's privacy state changed