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

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

Change-Id: Ie51cb7c87fb089c5c7257b11079a2325dbf701f9