Camera: pinch to zoom 2nd try

Change-Id: Ic1fbe6e10217b65f2bdd9bd443011cb0a0a62205