reset touch focus on capture and dont make focus mode dependent on scene mode

Change-Id: I7be67c49db290f12723c4d7b5e04495f6838eeb2