Merge "Add a class for Desktop Mode UIEvent logging." into main