Merge pull request #17992 from wilsonpage/bug/985006

Bug 985006 - [Camera][Madai][QRD Only] Camera Submenu is not displayed properly on rapid back and forth from submenu to camera menu