Ensured that the patch for Bug #925192 is contained within the Camera re...

...factor.