Merge "Add logging constant for vr display preference"