Ticket0722: Clean up small issues with focus typing mode