am 4847bb71: Merge "Fix view state when resuming from search" into ub-gmail-ur12-dev

* commit '4847bb71965a369280cc5c44833dc39e26a06284':
  Fix view state when resuming from search