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