Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev