Merge "Update ownership of the Desktop Experience flags." into main