Merge "Restore hidden text on Popup close" into sc-v2-dev