Merge "Fixing overlay scroll state not getting reset properly when scrolling is was cancelled" into ub-launcher3-calgary am: 7bc4b5bcd4
am: 0ab0175ded

Change-Id: I967eff6f7042426ebf38bac1a9a8b9c1fda526ac