Merge "Reset scroll position when account filter is changed"