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

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

Change-Id: Ie61ba34276b9e35a3c430486ac7c39f06e0e059b