Merge "Camera3: Clear Metadata channel references" into klp-dev