Merge "Camera1: Validate scene mode override AF mode" into lmp-dev