Merge "Camera3: Query camera during initialization" into klp-dev