Merge "Revert "Update ExploreByTouchHelper to calculate bounds on screen properly"" into nyc-support-25.1-dev