Merge "Adding color back to popup container." into sc-dev am: d88f572864

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

Change-Id: I449e101bc4fca3f9f8672d6b889406dac25b6c42