Merge "Properly prevent All Apps relayouts by avoiding scrollToPosition" into ub-launcher3-qt-qpr1-dev
am: d785fc289c

Change-Id: I69738f5d9c1f77195f2f82f963958d3cc741e9af