Merge "Add dev option to force desktop mode"