Merge "Special-case backup/restore of replaced settings" into rvc-dev