Merge "Camera3Device: Validate template ID" into klp-dev