Camera and QS fix

Change-Id: I5aa4d9ad7908ed0cb812fe48582715f2d44141c9