Merge pull request #18379 from justindarc/bug996513

Bug 996513 - [Flame][Camera] front camera can not work in master branch