Merge "Fix PhotoPickerTest with picker db enabled"