Merge "Introduce vendor header for selfManaged dialog" into tm-dev