Merge "Add tests for VR preferred display id calculation"