Merge "Folder polish" into sc-dev am: 1e558a2f4c

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

Change-Id: Ic291da103051a18efc9acf7fe3531fc366e6a8c3