Merge "Update midi services owner to avoid singleton" into main