Merge "Don't override expand count when page is opened from search"