Merge "Folder preview polish." into sc-dev am: 65c20f4a91 am: b0cb17aa95

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

Change-Id: I80ca9f11a82203b878daad00ae6c89fe494579b1