Bug 1004963 - Update camera tests
Merge pull request #18885 from chirarobert/1004963

Bug 1004963 - Update camera tests