am 7cfce946: Merge "Reset profile ids when backing up / restoring favorites." into ub-now-nova

* commit '7cfce9464e40fbd1e7b6308d6356da27a7082c81':
  Reset profile ids when backing up / restoring favorites.