Merge changes I089f3922,I3a52a472

* changes:
  Camera: Avoid enabling unsupported CAF modes during image capture
  Camera2: Set appropriate template for pre-capture