Merge "Add Interaction type java mappings for desktop mode" into main