A few fixes to make using the XR Device Simulator easier.
A few fixes to make using the dev sim easier.