Merge pull request #18134 from justindarc/bug993043

Bug 993043 - [Camera][Buri] viewfinder stays zoomed in and doesn't resto...