Merge "Group-UI: UI frameworks changes" into r-keystone-qcom-dev