Merge "Create config to enable app handle independently from desktop mode" into main