Merge "Camera2: Fix focusRange type" into klp-dev