Restore search state on view switch
See commit messages. This is a port of !1313 (merged) to the main branch.
The second commit is here for parity with !1313 (merged), although my hope is that later in the cycle this fix becomes obsolete.
See commit messages. This is a port of !1313 (merged) to the main branch.
The second commit is here for parity with !1313 (merged), although my hope is that later in the cycle this fix becomes obsolete.