Merge "Stop capturing mtp_event by reference in lambda" into oc-mr1-dev