Merge "Camera: Avoid invalid member variable access from RequestThread" am: aaa51ee218
am: 6b12cf9640

Change-Id: If3923704a07e0ff1e0e10053762fb3419571e3db