Merge "Fix broken DreamPickerControllerTest"