[DF-657] Scroll View after merge changes.