Merge "Restore hidden text on Popup close" into sc-v2-dev am: 414f17138f

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

Change-Id: I3990e6c63912670c9dec452e28d7c244c9ee0daa