Merge branch 'bugzilla-13931-sleep-nvs' into release