Merge "Prevent scrolling after the homepage recreating" into tm-dev am: 1c8e07438a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148787

Change-Id: I90043af7b684b956881f9fa8fd84ba1e920f5050