Merge "Always call onHandleAssist with AssistState containing at least activity id" into sc-dev