Otherwise in overview effect you cannot go back out the way you came. Tested-by: Merge Service <!2416> Part-of: <!2416> (cherry picked from commit f013dc41)