Merge "Add tests for logging keyboard configuration" into main