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

Change-Id: I78c20d7058de6c1d99145a755b93728afba4ba2e