Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom