Merge "Fix the problem that "forget" does not return to the previous level UI, bugId: b/341040773" into main