Fix 9.2 conflicts for "Assignee dropdown does not display selected assignee"
- Encountered conflicts while picking !11744 (merged) onto
9-2-stable
- Please fix the conflicts and merge this into
9-2-stable
/cc @iamphill
9-2-stable
9-2-stable
/cc @iamphill