Merge "Fix WhenToDreamPickerTest and re-enable." into tm-dev