Merge "Ensure activity view is always cleaned up" into rvc-dev am: 724bea0617

Change-Id: Id6c028792c0c288359714cdb957a89536092605e