Merge "Merge "Update midi services owner to avoid singleton" into main am: c668fc9e am: 965dc85b am: 3a37d1a3" into main