Merge "Move settings backup into separate class again"