Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev