Merge pull request #18244 from justindarc/bug994426

Bug 994426 - [camera][madai] Options menu items in wrong order