Bug 1017243: disguise camera slowness

address review comment and fix tests
Merge pull request #19739 from davidflanagan/bug1017243

Bug 1017243: disguise camera slowness r=justindarc a=1.3t+