Merge "Add UI type on selected event" into tm-dev