Fix yellow glitch in camera and other changes

Change-Id: I4da4c412e844d84c066def58e79c4aa401ee907c