Merge "Stop keeping freeform activities visible." into rvc-qpr-dev