Merge "Handle multi-user when disabling MediaMetrics service." into tm-dev