Merge "Prevent scrolling after the homepage recreating" into tm-dev