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

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

Change-Id: I55ee4709c3b8bcec36794756facb0a011fba7d11