Merge "Add an extra in AssistContent for providing contextual app functions data." into main