Merge "Merge "Update midi services owner to avoid singleton" into main am: c668fc9e58 am: c6c5cfca28 am: c6ad19e744" into main