Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS setting" into klp-dev