Merge "Fix test failure of ScreenOnTimeControllerTest"