Merge with untracked code and with DeviceOrientationControls.