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

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

Change-Id: I554410b87084605fe5d57bb6dc0f343713ae04a7