Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev