Merge "UI adaptation for supporting ONAP portal SDK"