Merge "Move persist setting back to individual devices"