Merge "Skip desktop mode LPM if desktop mode isn't on" into main