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

Change-Id: Id33ac71f6471478f2504dba4cebe85b3e6a6a102