Merge "Prevent NPE while finishing activity" into rvc-dev