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

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

Change-Id: I39ee96a082aa6679b0d84cc06f7379ec0ddb94d8