Merge "Camera2: Increase zoom steps." into jb-mr1-dev