Merge changes I7b9e6e7f,I9729cd40 into sc-dev am: 51b35256d2 am: 657a6da6fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14800258

Change-Id: Id99e80b9a50b4dc4ff6dc7b40f0c415fc482305e