Merge pull request #18057 from justindarc/bug991384

Bug 991384 - [camera][madai] HDR/Flash conflict messages missing