Merge "Adds userId to onTopActivityChanged callback in VirtualDeviceManager"