Merge "Fix broken tests in ClipboardManagerTest" into lmp-dev