Revert "replaced common-activity-uis with list of uis"

This reverts commit 6aff0002670e15d882ddcb80160650faf05e2851.