Merge "Fix AdaptiveSleepPreferenceControllerTest." into rvc-dev