Merge "Fix unregisterReceiver in ClipboardOverlayController" into tm-dev