Merge "Fix stuck focus outline after returning to home" into main