Merge "Update notification popup UI." into sc-dev