Merge "Add view ID, rework assist API."