Merge "Add ActivityListener to VirtualDeviceManager"