Merge "[SingleLineView] Fallback to mUser when senderPerson is null" into main