Merge "Allow setting a persistent VR thread."