Squashed tartfu's Camera pinch to zoom fix

Change-Id: I421f29e120de640ed47543df689a680aa2d6b7bf