Merge \"Cleaning up scrollbar logic to properly calculate stable extents.\" into ub-launcher3-calgary
am: b029e9fd66

Change-Id: Ife413a3aa3d0c194c7b409c69d87c1fcd7e8969e