Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev