Merge "Fix occasional crash in VirtualDeviceManagerService"