Merge "Fix view state when resuming from search" into ub-gmail-ur12-dev