Merge "Fix layout for multi-element rows (e.g. Screenshots)." into tm-qpr-dev am: 7f31d4c0

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



Change-Id: I3ec33607bb9d2ac702b4b0dc608538a4fd31b022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>