Merge "Fix regression in ending recents transition while locked" into main