Merge "Folder polish" into sc-dev am: 1e558a2f4c am: 6e1059810e am: 078c4437d2

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

Change-Id: I0df68083836f9eb2a84fcd197917757ae7848d01