Fix StrictMode violations in the AttachmentsPicker
#6029
+531
−67
Merged