Merge "Handle UserHandle.CURRENT in BroadcastDispatcher"