CLC-3081 - CFV - Remove "unbilledActivity" from UI code
https://jira.media.berkeley.edu/jira/browse/CLC-3081
Merge pull request #1995 from christianv/CLC-3081

CLC-3081 - CFV - Remove "unbilledActivity" from UI code