Merge "Fix unknown items issue when using Switch Access"