Merge "Fix BadParcelableException when transferInitiatorUserHandle is null" into main