Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev