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

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

Change-Id: I2c72501bb118239f342c7d6e4ff413904b5ab0b3