Revert "Modify scrollTo logic to avoid NPE" This reverts commit 85847d6b8cb780843b6b8effa3d9d6981766bd3d. Reason for revert: Doing a partial revert of this change as there are some tests getting flaky around this change Change-Id: I37150557303c018c3c32fb6126fffb643b610ed2