Merge "Remove anchor scrolling"