Bug 992393 - [camera][madai] preview mode UI updates
Merge pull request #18428 from justindarc/bug992393-v1.4

Bug 992393 - [camera][madai] preview mode UI updates
Merge pull request #18390 from mcav/icon-repeated

Bug 992876 - Reply icon repeated. r=jrburke
Conflicts:
	apps/email/js/cards/message_reader.html