Merge "Group-UI: Use group_id" into r-keystone-qcom-dev