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

Change-Id: I0de3e9df3118440627cd3e57527c683ffc4c9254