[DF-1858] ScrollView Final changes.