Fixed merge issues from RiftUp branch merge

Fixed a couple of issues introduced as part of the RiftUp branch merge.
Added minimum distortion scale appropriate for each HMD.