Refactor the 'tutorial' related settings

Change-Id: I243edc0a6623cc9f36a7964adc9d0647a03f6f80