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