Merge "Fixing overlay scroll state not getting reset properly when scrolling is was cancelled" into ub-launcher3-calgary-polish
am: 9e22de7cb3

Change-Id: I4cda26705c6344e26b43b608e3c3dc6c365b1fa3