[camera] bug 966830 and 966829 merged continuous auto focus and touch focus into one PR and changes made as per David's Comments