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

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

Change-Id: Ib6b16f98616411e5c76a0a1f43c8f79d9a054b46