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

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

Change-Id: Ibad19505cf0618a6db46874b08a96d9a3ecd1c4f