Merge "Fix folder crash where view is added when it already has a parent." into ub-launcher3-rvc-qpr-dev am: 20d3187d88 am: cbc1336abb

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

Change-Id: Ie6e1c73e161aede9d0ad07f842385e8926609caa