Merge "Fix ClipboardService device lock check for cross profile" into oc-dev