Merge "Camera2: update still capture template requirement"