Merge "Bug 5279842: mis alignment after scroll"