Merge "Keep VirtualDevice-created VirtualDisplays awake"