Merge "Add a new setting that saves if auto-resume timeout is set by user."