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