Merge pull request #17976 from wilsonpage/bug/991924

Bug 991924 - [Camera][Buri] Performance regression when selecting shutter button (camera and video)