Merge "Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: b9bd2da6f2" into rvc-d1-dev-plus-aosp