Merge "Fix ClipboardService's auto-clearing where wrong uid was being used." into tm-dev