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

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

Change-Id: If17c9d237eae4fb4825c909e29c99ab3cbf5994f