Merge "Fix guest icon is not clickable after adding user"