Merge "Update Desktop Mode repositories to be user-aware." into main